From 4e8aa0c37a7a0fe85d8fa7d7f9c4bcbb677382b6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 23 Feb 2019 16:53:19 -0500 Subject: [PATCH] main: Stop using gdk_surface_get_user_data Use gtk_root_get_for_surface instead. --- gtk/gtkmain.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index b06a4dd5d4..eb60808d78 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -131,6 +131,7 @@ #include "gtkwindowgroup.h" #include "gtkprintbackend.h" #include "gtkimmodule.h" +#include "gtkroot.h" #include "a11y/gtkaccessibility.h" @@ -1293,7 +1294,6 @@ rewrite_event_for_grabs (GdkEvent *event) { GdkSurface *grab_surface; GtkWidget *event_widget, *grab_widget; - gpointer grab_widget_ptr; gboolean owner_events; GdkDisplay *display; GdkDevice *device; @@ -1326,8 +1326,7 @@ rewrite_event_for_grabs (GdkEvent *event) } event_widget = gtk_get_event_widget (event); - gdk_surface_get_user_data (grab_surface, &grab_widget_ptr); - grab_widget = grab_widget_ptr; + grab_widget = gtk_root_get_for_surface (grab_surface); if (grab_widget && gtk_main_get_window_group (grab_widget) != gtk_main_get_window_group (event_widget)) @@ -2373,15 +2372,11 @@ GtkWidget* gtk_get_event_widget (const GdkEvent *event) { GtkWidget *widget; - gpointer widget_ptr; widget = NULL; if (event && event->any.surface && (event->any.type == GDK_DESTROY || !gdk_surface_is_destroyed (event->any.surface))) - { - gdk_surface_get_user_data (event->any.surface, &widget_ptr); - widget = widget_ptr; - } + widget = gtk_root_get_for_surface (event->any.surface); return widget; } -- 2.30.2